修改相关配置

.gitignore

@@ -3,3 +3,4 @@ target
 
 node_modules
 psdc-ui/yarn.lock
+dist

psdc-admin/src/main/resources/application-prod.yml

@@ -54,9 +54,9 @@ spring:
     # 数据库驱动
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
-    url: jdbc:mysql://192.168.10.99:3306/psdc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
-    username: hwjsolar
-    password: 123456
+    url: jdbc:mysql://127.0.0.1:3308/psdc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
+    username: root
+    password: root
   messages:
     # 国际化资源文件路径
     basename: i18n/messages

psdc-common/src/main/java/com/psdc/core/text/Convert.java

@@ -28,7 +28,7 @@ public class Convert
     public static String toStr(Object value, String defaultValue)
     {
         if (null == value)
-        {
+               {
             return defaultValue;
         }
         if (value instanceof String)

psdc-ui/src/router/index.js

@@ -142,20 +142,7 @@ export const dynamicRoutes = [
       }
     ]
   },
-  {
-    path: '/tool/gen-edit',
-    component: Layout,
-    hidden: true,
-    permissions: ['tool:gen:edit'],
-    children: [
-      {
-        path: 'index/:tableId(\\d+)',
-        component: () => import('@/views/tool/gen/editTable'),
-        name: 'GenEdit',
-        meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
-      }
-    ]
-  }
+
 ]
 
 const router = createRouter({

psdc-ui/src/views/bigview/index.vue

@@ -49,7 +49,7 @@
               <div class="txt">当前功率</div>
             </div>
           <div class="my3D_img">
-            <img src="../../assets/images/3Dimg1.png" alt="">
+            <img src="../../assets/images/3Dimg.png" alt="">
           </div>
           <div class="now_ele">
             <div class="data"><span class="screenNumber">{{ nowEle }}</span>kWh</div>