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

dsk-admin/src/main/resources/application-pre.yml

@@ -56,9 +56,9 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://47.104.91.229:3306/dsk-operate-sys?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://192.168.0.79:3306/dsk-operate-sys?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: dev
-        password: zfTFIJjaN#6xB83r
+        password: 8AXjjCHZ666!
       # 从库数据源
       #            slave:
       #                # 从数据源开关/默认关闭
@@ -130,7 +130,8 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 47.104.91.229
+#    host: 139.9.157.49
+    host: 192.168.0.79
     # 端口，默认为6379
     port: 6379
     # 数据库索引

dsk-admin/src/main/resources/application.yml

 spring:
   profiles:
-    active: test
+    active: pre
 
 # MyBatisPlus配置
 # https://baomidou.com/config/

dsk-operate-ui/src/views/project/projectList/component/jsnr.vue

@@ -313,7 +313,7 @@
           return false
         editXMNR(param).then(result=>{
           if(result.code == 200){
-            this.$message.success('修改成功!')
+            // this.$message.success('修改成功!')
             if(param.investmentAmount){//修改项目阶段
               this.$emit('Refrehmoney')
             }

dsk-operate-ui/src/views/project/projectList/component/xmsl.vue

@@ -276,7 +276,7 @@
           editXMNR(JSON.stringify(params)).then(res=>{
             if (res.code == 200){
               if(!param.projectStage){
-                this.$message.success('修改成功！')
+                // this.$message.success('修改成功！')
               }
             }else{
               this.$message.error(res.msg)
@@ -314,7 +314,7 @@
         }
         addLabel(JSON.stringify(param)).then(res=>{
           if (res.code == 200){
-            this.$message.success('修改成功！')
+            // this.$message.success('修改成功！')
             this.tipsvalue = ""
             this.getXMSL()
           }else{
@@ -330,7 +330,7 @@
         }
         removeLabel(JSON.stringify(param)).then(res=>{
           if (res.code == 200){
-            this.$message.success('修改成功！')
+            // this.$message.success('修改成功！')
             this.getXMSL()
           }else{
             this.$message.error(res.msg)

dsk-operate-ui/src/views/project/projectList/detail.vue

@@ -287,7 +287,7 @@
         }
         editXMNR(JSON.stringify(params)).then(res=>{
           if (res.code == 200){
-            this.$message.success('修改成功！')
+            // this.$message.success('修改成功！')
             if(this.nowedit == 1){
               let _this = this
               setTimeout(function() {

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

@@ -73,7 +73,7 @@ public class RegionalEnterprisesServiceImpl implements RegionalEnterprisesServic
                             List<Map<String, Object>> companyNameList = (List<Map<String, Object>>)MapUtils.getObject(topSupplierMap, "data", null);
                             for (Map<String, Object> comMap : companyNameList) {
                                 Integer id  = MapUtils.getInteger(comMap, "id", 0);
-                                if (id.equals(topCustomerId)) {
+                                if (id.equals(topSupplierId)) {
                                     String companyName = MapUtils.getString(comMap, "companyName", null);
                                     companyMap.put("topSupplier", companyName);
                                 }