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

dsk-operate-ui/src/views/detail/groupAccount/component/members.vue

@@ -185,11 +185,11 @@
           dialogExportVisible:false,
           forData: [
             {label: '企业名称', prop: 'companyName',slot: true,minWidth: '250'},
-            // {label: '科技型企业', prop: 'companyName', slot: true,minWidth: '160'},
+            {label: '科技型企业', prop: 'kjxqy', slot: true,minWidth: '160'},
             {label: '成员层级', prop: 'combineMemberLevel',slot: true,minWidth: '100'},
             // {label: '主营业务', prop: 'projectName', slot: true,minWidth: '260'},
             {label: '法定代表人', prop: 'corporatePerson',slot: true,minWidth: '100'},
-            {label: '企业地区', prop: 'address',minWidth: '120'},
+            {label: '工商注册地', prop: 'address',minWidth: '120'},
             {label: '注册资本', prop: 'regCapital',minWidth: '150'},
             {label: '持股比例', prop: 'stockPercent',minWidth: '100'},
             {label: '成立日期', prop: 'registeredDate', slot: true,minWidth: '100'},
@@ -197,6 +197,7 @@
           exportTableData:[
             {
               companyName:'XXX集团有限公司',
+              kjxqy:'高新技术企业',
               combineMemberLevel:'集团本身',
               corporatePerson:'柳xx',
               regCapital:'8000.0万元',
@@ -206,6 +207,7 @@
             },
             {
               companyName:'XXX集团有限公司',
+              kjxqy:'科技型中小企业',
               combineMemberLevel:'一级企业',
               corporatePerson:'江xx',
               regCapital:'14000.0万元',
@@ -493,6 +495,8 @@
         memberListExport(this.dataEXCEL).then(res=>{
           if(res.code === 200){
             this.exportData.exportEXCEL=true;
+          }else {
+            this.$message.error(res.msg);
           }
         })
       },

dsk-operate-ui/src/views/detail/groupAccount/component/performance.vue

@@ -327,6 +327,8 @@
         exportWinBid(this.dataEXCEL).then(res=>{
           if(res.code === 200){
             this.exportData.exportEXCEL=true;
+          }else {
+            this.$message.error(res.msg);
           }
         })
       },

dsk-operate-ui/src/views/detail/groupAccount/component/zbxmmx.vue

@@ -303,6 +303,8 @@
         exportBid(this.dataEXCEL).then(res=>{
           if(res.code === 200){
             this.exportData.exportEXCEL=true;
+          }else {
+            this.$message.error(res.msg);
           }
         })
       },

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

@@ -571,7 +571,7 @@ export default {
           {label: '实控人', prop: 'actualController', slot: true,minWidth: '140'},
           {label: '最新报告期', prop: 'latestReportPeriod', slot: true,minWidth: '120'},
           {label: '总资产（亿元）', prop: 'totalAssets', slot: true,minWidth: '120'},
-          {label: '归母净资产', prop: 'belongNetAssets', slot: true,minWidth: '120'},
+          {label: '归母净资产（亿元）', prop: 'belongNetAssets', slot: true,minWidth: '140'},
         ],
         exportTableData:[
           {
@@ -1006,13 +1006,15 @@ export default {
       }
       this.dataEXCEL.exportExeclName=this.exportData.title;
       if(value){
-        this.dataEXCEL.exportCount=value
+        this.dataEXCEL.pageSize=value
       }else {
-        this.dataEXCEL.exportCount=2000;
+        this.dataEXCEL.pageSize=2000;
       }
       api.uipSerachExport(this.dataEXCEL).then(res => {
         if(res.code === 200){
           this.exportData.exportEXCEL=true;
+        }else {
+          this.$message.error(res.msg);
         }
       })
     },

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

@@ -3054,6 +3054,8 @@ export default {
         api.aptitudeExport(this.dataEXCEL).then(res => {
           if(res.code === 200){
             this.exportData.exportEXCEL=true;
+          }else {
+            this.$message.error(res.msg);
           }
         })
       }
@@ -3061,6 +3063,8 @@ export default {
         api.infoExport(this.dataEXCEL).then(res => {
           if(res.code === 200){
             this.exportData.exportEXCEL=true;
+          }else {
+            this.$message.error(res.msg);
           }
         })
       }

dsk-operate-ui/src/views/macro/urban/index.vue

@@ -363,7 +363,7 @@ export default {
           {label: '实控人', prop: 'actualController', slot: true,minWidth: '140'},
           {label: '最新报告期', prop: 'latestReportPeriod', slot: true,minWidth: '120'},
           {label: '总资产（亿元）', prop: 'totalAssets', slot: true,minWidth: '120'},
-          {label: '归母净资产', prop: 'belongNetAssets', slot: true,minWidth: '120'},
+          {label: '归母净资产（亿元）', prop: 'belongNetAssets', slot: true,minWidth: '140'},
         ],
         exportTableData:[
           {
@@ -853,13 +853,15 @@ export default {
       }
       this.dataEXCEL.exportExeclName=this.exportData.title;
       if(value){
-        this.dataEXCEL.exportCount=value
+        this.dataEXCEL.pageSize=value
       }else {
-        this.dataEXCEL.exportCount=2000;
+        this.dataEXCEL.pageSize=2000;
       }
       urbanInvestmentExport(this.dataEXCEL).then(res=>{
         if(res.code === 200){
           this.exportData.exportEXCEL=true;
+        }else {
+          this.$message.error(res.msg);
         }
       })
     },

dsk-operate-ui/src/views/radar/components/MajorProject/index.vue

@@ -698,6 +698,8 @@ export default {
       api.radarExport(this.dataEXCEL).then(res => {
         if(res.code === 200){
           this.exportData.exportEXCEL=true;
+        }else {
+          this.$message.error(res.msg);
         }
       })
     },

dsk-operate-ui/src/views/system/user/profile/index.vue

@@ -86,7 +86,7 @@
             <el-pagination background :current-page="params.pageNum" :page-size="params.pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
           </div>
           <div class="tables">
-          <div class="empty" v-if="tableDataTotal==0">
+          <div class="empty" v-if="tableDataTotal==0 && !isSkeleton">
             <img class="img" src="@/assets/images/project/empty.png">
             <div class="p1">暂无数据展示</div>
           </div>

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

@@ -418,9 +418,9 @@ public class SysRoleServiceImpl implements ISysRoleService {
         int rows = userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>()
                 .eq(SysUserRole::getRoleId, userRole.getRoleId())
                 .eq(SysUserRole::getUserId, userRole.getUserId()));
-        if (rows > 0) {
-            cleanOnlineUserByRole(userRole.getRoleId());
-        }
+        //if (rows > 0) {
+        //    cleanOnlineUserByRole(userRole.getRoleId());
+        //}
         return rows;
     }
 
@@ -456,9 +456,9 @@ public class SysRoleServiceImpl implements ISysRoleService {
         int rows = userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>()
                 .eq(SysUserRole::getRoleId, roleId)
                 .in(SysUserRole::getUserId, Arrays.asList(userIds)));
-        if (rows > 0) {
-            cleanOnlineUserByRole(roleId);
-        }
+        //if (rows > 0) {
+        //    cleanOnlineUserByRole(roleId);
+        //}
         return rows;
     }
 
@@ -515,9 +515,9 @@ public class SysRoleServiceImpl implements ISysRoleService {
         if (CollUtil.isNotEmpty(list)) {
             rows = userRoleMapper.insertBatch(list) ? list.size() : 0;
         }
-        if (rows > 0) {
-            cleanOnlineUserByRole(roleId);
-        }
+        //if (rows > 0) {
+        //    cleanOnlineUserByRole(roleId);
+        //}
         return rows;
     }